Merge changes I5610b42b,Ib7a52bd0 into pi-dev
am: e4e1b4fbec

Change-Id: Ia9eae991b930444a8f957fb405b7166d6ecc2583