Merge "Convert BubbleDataRepositoryTest to use mockito-kotlin" into udc-qpr-dev