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

am skip reason: subject contains skip directive

Change-Id: Ia127db655eda161e6bb8ee6ae22374e38b7bcefd