Merge changes I819a2942,Ife0607e7 into pi-dev
am: 5acc0b1fa3

Change-Id: I2a0cdda1ea9b5d9e9588c5d6c8f0e9859ab1009b