Snap for 5450365 from f688a41d2bfa470385763378aa06bce203cff134 to pi-platform-release

Change-Id: Ia6edc7f5646e797e842863c6da0f740a5c52cc48