Merge "Clean up T&C implementation"
tree: 0cd1001bdb415c4feef1e9a2d44e593057a8a87b
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS