Merge "Provide better detection of requiring sign-in" into stable-2.11