Merge "Fix broken unit tests due to mockito upgrade." into oc-dev