Bug: 71360761 Test: cts -m CtsNetTestCases (on NYC branch) Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274 (cherry picked from commit 85156429a2)
85156429a2