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

Change-Id: Ie8e8d21a6647c10ffc73f4c252a83a8057612e9d