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

Change-Id: I70370b80dd5a872046a6d4e0d6dd8ad3243a3f75