This reverts commit bc571c7cc8. Reason for revert: Rolling forward, will fix tests in same CL stack. Bug: 114231106 Bug: 130397860 Test: FrameworksNetTests Change-Id: Ia8a0c99b4e1fd5dff26c881715cd876618ca4321
bc571c7cc8