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

Change-Id: I5907c3bf6b37418d9167c30b2847123b98cfdb6f