Merge "Prefer software codec with debug property" am: 829b2a0bf0 am: 78d6bc884c
am: 35f53af1da

Change-Id: I0a06aba054e4eeac75f456e164fe554d03bb385a