[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE"" into pi-dev am: 22a46ae379 -s ours
am: cb9c7ca48d

Change-Id: Ibe69aa215a2297bc0c206321fb3379f71b73a647