Merge "Rename phoneId to slotIndex"