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

Change-Id: Ib6ddd38115e71956c142d5caf061d8d219054b39