Merge "Avoid Concurrent Exception in BaseDataProducer." into tm-qpr-dev