Merge "Fix device address and interface address usage"