Snap for 5180536 from e6020941f11d6f2a6bdbe5f1c0d516ee40597e51 to pi-platform-release

Change-Id: If17e7e049978fbf4ca01a189f0a1befcbf9421a8