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