Snap for 5180536 from eeedf7c7d04c223ea9e27674fd3809b5506ca5f4 to pi-platform-release

Change-Id: I40df03457e73c06809f338215e8c818c3ca55b68