Merge "Avoid user autocreation race condition caused by repeatable read"