Snap for 4770446 from 4a036f2b2f8d2a1de7aacc7995cdf0c9b720e046 to pi-release

Change-Id: Idc7bcbc1212dc69cd085a23cf3878de4026d18c0