Snap for 5180536 from 81ed378559c43c8da4a4b20a290e4519d29a4598 to pi-platform-release

Change-Id: I5729e406958df0e8ad7e1aaf085aefc131da5c93