Merge changes Iae3d6f9d,I79e25d27 into pi-dev
am: da74fce85a

Change-Id: I8479550c68c1659d7e4b914277b77c3ff8300d9f