[automerger skipped] RESTRICT AUTOMERGE am: f9418dbb2c am: 2130fd70bb -s ours am: ab7aef5c70 am: f9d7691583

Change-Id: I01d85bc17820586df7bb04be770d95570f8242c6