Merge "Merge "Fix deadlock in BaseDataProducer." into udc-dev am: 9e82320b77 am: 416e0dab27"