Merge "Clean up T&C implementation"
tree: 3c25689d92f9442e9a900c626d1231ee9e0afe59
  1. framework/
  2. service/
  3. OWNERS