Snap for 5622519 from 3750847861dd817fe5a3ec3d5d7ac0bb6e3d5016 to pi-platform-release

Change-Id: If3212392566cbf43878405b346c18e1a18f544b8