Snap for 5622519 from 39b171f81f46a5670e6fb3916f2b0c850f39cc01 to pi-platform-release

Change-Id: Idb0155a8cde5de94c4350405b45466f59ca86d73