Snap for 5622519 from f29ab2dbaaf2635f403be82238b18ad3ff673514 to pi-platform-release

Change-Id: I6adbf01d3a887ca0acf669e525d363eb2a37c79e