[automerger skipped] RESTRICT AUTOMERGE am: 6be0264414 -s ours am: 0944c7edff am: 1c68c6f6cc am: 43b8e18cb4 -s ours am: dad9803b51 -s ours am: e0549ac817 am: 7a2eb9f923

Change-Id: I917f0659da81118da865342a89f560d7988c0c2e