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

Change-Id: I51c584d6951bd36f3fbad080c931326bb31882bb