Snap for 5622519 from 9a7aec451295cee84ef7682dd1328c2e063edc70 to pi-platform-release

Change-Id: I065bfc919e98674690ac040f31dacff46b6c0f73