Merge "Merge "Add utils to convert Inet4Address <-> int" am: 5caebe3415 am: 2595e68176 am: 004c3347ad am: 0a56b25bcf"