Snap for 5180536 from dd6c5546adc4715854182358c2dd68691434efe9 to pi-platform-release

Change-Id: Ia2eb25a94426fbf838b6f87a797d9d9e2460f86c