Merge "Fix CTS test case failure test_isReachableLjava_net_NetworkInterfaceII" am: c48bfa3c5a am: 690fe3c15b
am: 03136d3599

Change-Id: I869c27782f6d9d3b906301e126bf3278e14441f6