Snap for 4628106 from b8b06ce000306a7ecb418840d32e90b27dd76a71 to pi-release

Change-Id: Ifd52388a8e5091b035f9b96baaf8f2282f63d606