Merge "Enable optional codec by default" am: af38e5a7bc am: 480315056c
am: b6dd883437

Change-Id: Id3557ff443905d72a74878b7f3d150eaef5c9234