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