Merge "Remove redundant calls to clear_isolated_creds"