Snap for 5674421 from 2402bec9f1b7f4a6e4b3e4de1a6d7cf68efbc216 to pi-platform-release

Change-Id: I134287fdd476d0fd7b179fb2b3111edd45d0b812