[automerger] DO NOT MERGE Fix OOB read before buffer length check am: e64b4a38 am: d952a369 am: a999037d am: aa9c2543 Change-Id: I816d8bb946c890cce0062e66f0aa751fed606570