Snap for 5674421 from 5b24ead12ce74791a53f47a4a588006fdfc33d80 to pi-platform-release

Change-Id: I67b46aa31653876436920c7e2800e3d254bb59e8