Snap for 4722539 from b3ebfaaeef2fa5fd3f1071b0fe8b9b92edbbdd2d to pi-release

Change-Id: Ifee7113065ba37d9696798b9dec18b2969c13758