Merge "Refactor DOMDataBrokerImpl"