Snap for 5674421 from b536cc95b0281d840dabeeb9e9fd29d0cd5d06e2 to pi-platform-release

Change-Id: I2777fb6a6b2ae26f6aa3185d70b4f617350ad1b1