[automerger skipped] Merge changes I5863100a,Ib6766381 into pi-dev
am: ea17cd3cf1  -s ours

Change-Id: I8976adb9dbeb68ebb8b8fff2a130742482e24a7f