Merge "Always set right auth_type value in apn."