Merge changes I6358cfe3,I00b20bd7 into pi-dev
am: ef85bbfe4d

Change-Id: I19b0bc43a480d1759f8412406f3755ab2592fd29