Merge "Add portId to HPD-related methods"