Snap for 5180536 from eb71e821edd929d48a824a9a4bbdfb710b50d324 to pi-platform-release

Change-Id: I7c5a9c9e96572c32eadd97448c4886f9c9150a19