Merge "Fix NPE in getAuthToken."