Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
am: cd9440cc63

Change-Id: Id813f59853d1e22f96d3c31a32bd4507dd638290