Merge "allow null authtokens to invalidateAuthToken" into froyo