Snap for 5622519 from 81023f4194eeb6e8123445d2441869bf55bf2f87 to pi-platform-release

Change-Id: I4b5f88bdd41494215bdcd07612e8c866137aebc9