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