Merge "Remove contents of DependencyProvider." into tm-dev