Snap for 5622519 from f0a226d6715cd32f37825298feee66fd7f226fdf to pi-platform-release

Change-Id: I412f33317a92ab0c361a632480f0124c270b421f