[automerger skipped] RESTRICT AUTOMERGE am: 98f45443e1 am: 68a439a706 am: 489352696c -s ours am: 3a6798fba0 -s ours am: 1f6be626bf

Change-Id: I1ac4593477f67ebbb43daad04e6e9bef2b29d959