Snap for 4393550 from a199086bfafc4503b9a3f27557ca1c554d364366 to pi-release

Change-Id: I15f2a0d6ba22cc48136369f11e71b1dfdc383e20