Snap for 4373608 from 4a51c0b82be3be4c19da8d779a95b8e3e599df05 to pi-release

Change-Id: I3afeac2b7b5beead39adebd8fee430356cb4eca6