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

Change-Id: I4ce902c341cb8c151b83140f49f0a8e12dd9da42