Snap for 5622519 from e90514f71460097fa3c1058cb73d78238c121433 to pi-platform-release Change-Id: Ia179f195a05965e129c2b7e0452aed0519a4a62c