Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"