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

Change-Id: I4808dc1c24e63d3cdd580b99a64f24f5b466b1d1