Merge changes I2b89dce1,I5412eae0,I2e428ec1 into pi-dev
am: 990cc3e31d

Change-Id: Idc55f1c7a04c771527336a013f06ddadd4dc9682