Snap for 5622519 from f567078205fa71210a74d0489e1069249abade75 to pi-platform-release

Change-Id: I6c5e43c6537d0af8126fccc83b51aad570cd4ee9