[automerger skipped] Add buffer size checks to eliminate security vulnerability. am: 0fef164d3d -s ours am: 40c6e10c72 -s ours am: a7b5f0707c -s ours am: 273767d149 -s ours am: 630740f967 -s ours

am skip reason: Change-Id I5977e216bcaecd4ed10c0a991bed2860e6d627d9 with SHA-1 0fef164d3d is in history

Change-Id: I4df322ae80e13af3b7ff707f5b450a04b9b37087