Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.

Change-Id: I860ef073a7ac2d4151d95b37a3b8cd496de6faff
BUG: 117431430