Log more to help debug OAuth

Change-Id: I112a2abe1c74dc60e0636828d69ff36f384778ac
Merge "Log more to help debug OAuth"
Merge remote-tracking branch 'origin/master' into deployment

Change-Id: I05a48ae1099407f5409d1faa8470a03d53d1da93
Merge "Merge remote-tracking branch 'origin/master' into deployment" into deployment