Snap for 4610834 from 4af2189d9333a5dfb1316b2e5cab3f8af040e681 to pi-release

Change-Id: If15d62f00d0e8a9c724fe890ac51c1ff9315e6ce