[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 0b23243935 -s ours am: 03d66b4241

Change-Id: I43371a447e74e6bde673086b66562b082ef2d391