Merge "Remove Dependency.get usage, warnings, and dead code" into tm-dev