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

Change-Id: Ifb0130fa2b413d1b8a769684cffb6c6621ea9859
BUG: 117431430