Merge "Fix NetworkInterface#getSubInterfaces throws NPE"