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

Change-Id: I91a9766daaf548f91952295f1dd9e4d42a386131