Merge "Merge ag/3722536 from master to pi-dev." into pi-dev
am: b68e059613

Change-Id: Ia0103a7a1c67f239fc94fb033fd0af67cd2e4971