Merge "Use the term port_id for HDMI port index across definitions"