Merge "Enable optional codec by default"
am: af38e5a7bc

Change-Id: I57619a054ca66286b20b8d8476ede7aab901b086