Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
am: a3d106204d

Change-Id: Ib2d558372f7c06812e615e34332ce64dce006af7