Merge "Fix a race condition during async credential check"