Snap for 5524043 from 7d3783e5f7def351e74cf2c75c8ec96fba999d78 to pi-platform-release

Change-Id: I5584b46d6922897d41b601ce49e72d245ab451fb