Merge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-dev