Snap for 5450365 from e6ef013d2c8c1201540128d9961b73450257ab90 to pi-platform-release

Change-Id: I51d6a1b331634e927247a13a96bfdd10d4e00f4f