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

am skip reason: subject contains skip directive

Change-Id: I43ecc5a1a0f002ac9c3407e07a8cbfac5a414754