Snap for 5622519 from b869620327dabaebe715a7d8fb3d12cdddd5a221 to pi-platform-release
am: 5c3946d093

Change-Id: I5ab8ebdbf31bf93980040a42ca94498c8a940a72