Merge "Fix NetworkInterface#getHardwareAddress corner case"