Merge "Allow customized registration of codec services" into pi-dev am: d549c0835a
am: 38ca1a3c28

Change-Id: Id6a3c8e218845d49d33e9661a960458490bdc2e6