Snap for 5622519 from 10c6d395963106857aa34efe4519c462d2c0e406 to pi-platform-release

Change-Id: I904e4146d4065db30054727c5d35609cbee0c37c