Merge changes If834d0f0,I05ec75c7 into pi-dev
am: 6d61113df4

Change-Id: Ie4c3729fc1258f0f452fb57b6b345e873bfb440d