Snap for 5180536 from cb5531e3576fec2be6e366f16dd85696a20552b3 to pi-platform-release

Change-Id: I371b04b4aaaec81d980678f6315b920d9b5c27ac