Snap for 5622519 from 9b6f2643661e4667493debdcccbba3ec518eb963 to pi-platform-release

Change-Id: I8a8f866a21085bb92c452610b922e2651eb5ea15