Merge "Don't set hdmiPortId for non HDMI device."