Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6
am: 11569624aa

Change-Id: I2d1646f3c49f9eb64b8df86264508afdc7d6212b