Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b into pi-dev
am: a08802dac1

Change-Id: Icfc9aab47db9568d5c06b11c3713f49924b94438