Merge "Unit test fixes. Most failures were due to new mockito."