Bug: 113554781 Bug: 146583853 Test: FrameworksNetTests Change-Id: I19d965c0146196cb67b3417eb1790ccd90ce3233