[automerger skipped] RESTRICT AUTOMERGE am: fe4bf7926e am: 9680a6d75d am: e0465e2881 -s ours am: 8c5af9b7d9 -s ours am: 1ed77b86cf am: ee0de45fee
am: 7ff4dc9b9e

Change-Id: I2af6817b3c8b0a3f0ef23b02f85b0ed43c1f04c7