Merge changes from topic "am-a988fd47-73ee-44e9-929f-5374e8851656" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read before buffer length check am: 6fe963e2 am: f67472ad
[automerger] DO NOT MERGE Fix OOB read before buffer length check am: 6fe963e2
DO NOT MERGE Fix OOB read before buffer length check