Merge changes I0c466350,I09a9cd43,I8b2a0819 into pi-dev
am: 4cda02f25f

Change-Id: If5e410a3bb21d7188ef0d505d4d03cec1c4c2a74