Merge "Bug 629: Make BindingDataBroker to be visible."