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

Change-Id: I1b8569398e14e40cbd7004aad5e98a29b3e8729f