[automerger skipped] RESTRICT AUTOMERGE am: a9211d68 am: 8f258aae -s ours am: d6f93c95 am: 18e20b7b am: 3a572223 Change-Id: Ibce098c265931119697d369a9d1be35a77973b34