Merge "Fix usage of internal mockito API"