Merge "b/2864818 use authType for cert verification."