Snap for 4610834 from 0f160fbaee9ecf472feb3e332f01c4ddb95caa0e to pi-release

Change-Id: I40388543ecfcd7475bfa8737a22f3a8ccd3fad5f