Codec 2.0: finalize component names am: 527da4c9d3
am: 00838b0bc0

Change-Id: I1bd80303924686b54c8ffaa2d4ae938baf59adf3