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

Change-Id: I447be55a03c75561f6237dcf9a89fea3d4446467
BUG: 117431430