Snap for 5622519 from bae5418d852de07601ea06a1e66ec966978c6324 to pi-platform-release

Change-Id: I38316ac47b9bbb75cb3154ad4412be4684b87fe9