Snap for 5622519 from e7055ee4f72fe027cfb970330fecdc672e8ee83d to pi-platform-release

Change-Id: I18305a4618a796f78c65736892325778abd7ba07