Snap for 5180536 from eeedf7c7d04c223ea9e27674fd3809b5506ca5f4 to pi-platform-release
am: befee77b22

Change-Id: Ief4c546f094b7432743cffd050cbb5b586e66973