Merge "Guard against codecinfo overflow" into mnc-dev