Snap for 5674421 from fa4a379ff8e06a8d0d9a9c9e57c3b3cdb6027db1 to pi-platform-release
am: a22302ec9a

Change-Id: I3c0ca7285c5c3798aab2d966829706a929d777f8