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

Change-Id: I7eb9dabc3e5d51cbff94e7885a04607b3ec74ddf