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

Change-Id: Ieacb51890d6c7708b2718f1f83d84c4f2f3eaff7