Snap for 5180536 from 3fcc4c6f8756843271b3f68df4b52f72532f4e66 to pi-platform-release Change-Id: I0dcde20fde09a1e5943a2acd254d912f812dcf39