am de267aef: am 0805add7: Merge "Guard against codecinfo overflow" into mnc-dev

* commit 'de267aefb3d366e1594ce1a924e0d05db2277aec':
  Guard against codecinfo overflow