Final OAuth2 fixes for latest version of system core.