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

Change-Id: If30b6ca8ef2d53d4e0f1f4650a8963995573dd87