Snap for 5674421 from fa4a379ff8e06a8d0d9a9c9e57c3b3cdb6027db1 to pi-platform-release

Change-Id: I21a3d84d92ce4f10559f2424705b50acf9500ca7