Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev