Snap for 5180536 from 1f5f55bfaa13923bc5483a6f9d8189ed4edc74a6 to pi-platform-release

Change-Id: Ifb448e3a33ff0af3e9dcda33d1deb0a5cc47bff0