Merge "FP2-1765: EAP-SIM support" into fp2-dev-v2