Snap for 5524043 from a736dde3f4625ffbc6487065c53545e76f7433b4 to pi-platform-release

Change-Id: I9998fe9b732b39b669a06a30fa7a22847c6b65ee