Snap for 5524043 from f6b0c9c69c80374f534f11ada8a0bcfb4e86c755 to pi-platform-release

Change-Id: I9ff80d9c5a07ac4579983f4267d2ff6c304e16e1