Redoing the OAuth code review changes in a new branch due to conflicts

while merging in Git.