Merge changes I19704971,I20e0537a into pi-dev
am: 35c76427a2

Change-Id: Ic41426d32bb58076badf2b2be798c6f863d00618