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

Change-Id: Iaed6e1eb8625c9147c1d4379703ea297fc2242fb