Snap for 5622519 from 7b904fb0143c85626198c8b65f9f9ea2de8cc271 to pi-platform-release

Change-Id: Ia4f136a241bc3cbdbbf9df6c35d4c55bda2d62b7