Snap for 4610834 from f11ba899d5c04b2e0445e0b47cbf26d89ced4f7d to pi-release

Change-Id: I927352870a8e4105bde88ab37e09cea56a96c9bb