Merge "Add a TODO to import python deps" into tm-dev