Merge "Call clear_isolated_creds in scenario tests"