Merge "Change optional codec status when selectable codec is valid"
am: db22a4172a

Change-Id: I75eae79df1d8e526461b0de0d89ab4be79086912