Snap for 5524043 from e31b34fa0cd1e70d1105e2f472d400f6619b2913 to pi-platform-release

Change-Id: Ic11e8de9f8384ee039c536f67febaa56e9a3a673