Merge "Use phoneId instead of SimSlotIndex"