Snap for 4610834 from 0acf9d9754e5a15f93d23b715288ecb74034b3a2 to pi-release

Change-Id: I3a25d5a57e2388263a339931f9f223bb8ef6b2eb