Snap for 4425573 from be5dd0798efc98846f37c1293d5cc6973dd03b6a to pi-release

Change-Id: I94ac485bd90b696a06b200bde8f5d1c1279cb23f