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

Change-Id: Ia6cdefec72b57457f4f1b9a14601253efa117858
BUG: 117431430