Snap for 5622519 from e9f81d7eb99a8589c4eeac99295873b2160ec20e to pi-platform-release

Change-Id: I03939ad5355e4ca1085dc677e551e6e19796031c