Snap for 5310204 from 70b3947baf9845fd56aac0b287f30c67f154d8e6 to pi-platform-release

Change-Id: Iccfcec11cfce8426a17a121b9fd373bf994b850e