Merge "Remove explicit mockito version"