Snap for 5674421 from 4b1a883fc7fc198f73063bc49b710d1edd14918e to pi-platform-release
am: e6ee2f7edc

Change-Id: I6b50b53d247f453d28c869bc39c96ea43b673c87