Merge "Clean up the check of AuthType in simialr()"