Snap for 4386413 from 87357fa2f13a68c4d54cf153713c5f2ede6af79d to pi-release

Change-Id: I7a4caf72af5634abb90c71ccb07f26c7c1ed6006