Merge "Convert tests with listeners to use Mockito." into mnc-ub-dev