Snap for 5622519 from aa22afd88b4ff0fc467fa57d88ebc87de3021319 to pi-platform-release

Change-Id: I5949081369003cd14446767e848550e2197780c0