Merge "Include phoneId as extra when subId is not available."