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

* commit '0805add748f6857cb7537a1e16562f59dc96e334':
  Guard against codecinfo overflow