Snap for 5622519 from c69458ce0af130bc25fa3e8ff9099c04c0896834 to pi-platform-release

Change-Id: Ie014901f2cace442c7302534624685b9a0208ea2