Snap for 5450365 from 14fc0bb1ca92e132c826662847d2ee5cbe19d594 to pi-platform-release

Change-Id: I223d7375bc7d46358fcdfc8d40eb1e7e495f1ad9