Snap for 5622519 from bae5418d852de07601ea06a1e66ec966978c6324 to pi-platform-release
am: 8cd9b36dc3

Change-Id: I44f0446338ddacbbb8f267cad26f87bff6258863