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

Change-Id: I880c32c18f6af7ece5e3510f72f7a25d9291716c
BUG: 117431430