Snap for 5180536 from 9a6ffe363a0b7b1626d8e609da4aed4b06d2b079 to pi-platform-release

Change-Id: Id73192afd82de8622f5ad9daba6dd4d113a50845