Merge "Fix BubbleDataRepositoryTest" into udc-qpr-dev