Merge "Change optional codec status when selectable codec is valid" am: db22a4172a am: 4eedcac78e
am: 8c1e73d398

Change-Id: Ia2c09f7aef2d1d347c0e4b00a08a92f7bc206bbc