Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev