Merge "Support strict conservative peer mode for EAP-SIM/AKA/AKA'"