Merge "Fix SIM authentication failure with 2G SIM"