[automerger skipped] Gatekeeper: revised buffer handling am: be4a8f4eeb am: cad82bcad3 -s ours am: 54062604cc -s ours
am: 7e3e159a45 -s ours
am skip reason: change_id Iad911bafb939fdcec1e3d19f6d1af0fe98cc2080 with SHA1 4f4501ec2f is in history

Change-Id: I29a01f33cb88c347463f53d42d101207c13cd05b