Snap for 5622519 from b41383de4cf71e1d12e5a911e0d58d9ab7b0679e to pi-platform-release

Change-Id: I458ac2cb42e23f0d5ed2f87729efe7e8c72bd968