Merge "Bug 1396 : Change from deprecated DataBrokerService to DataBroker"