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

Change-Id: I9e9092381afb7f559cdc0696418b8528b4188316
BUG: 117431430