Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into mnc-dr1.5-dev
* changes:
[automerger] Fix possible out of bounds read am: 3762e061 am: ecc92a1a am: 1c7bb87a
[automerger] Fix possible out of bounds read am: 3762e061 am: ecc92a1a
[automerger] Fix possible out of bounds read am: 3762e061
Fix possible out of bounds read