Merge "Add IPv6 Handling for DSCP Policies and Support Interfaces with MAC Addresses"