Bug: 210073043 Bug: 204830222 Test: FrameworksNetTests Change-Id: I1ade9113e9367a85b7c200c8f52d8ff3ffc14770