Snap for 5674421 from b536cc95b0281d840dabeeb9e9fd29d0cd5d06e2 to pi-platform-release
am: 373d5d9baf

Change-Id: If094bf49b1af714d4865d134527f8cdfc96c7250