Merge "Refactor InetAddress.parseNumericAddress/isNumeric" am: 1552e10ead
am: e4249b96a9

Change-Id: I44f623bcb7b50a9cc58765074330b55737b38708