Merge "Add mockito dependencies to support-transition"