Merge "Revert "Use mockito-extended in FrameworksNetTests""