Snap for 5622519 from e035e3c31904c790e5c3d88a78b98d5566038af3 to pi-platform-release

Change-Id: I3d90a4c3861c2ac74bd10bc6b531b00959272d3c