Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev