Bug: 222291489 Test: build, FrameworksNetTests Change-Id: If54bed41e96a1b1ef169d89a0caa9e4300578374
4734b5810b