Merge "Remove TODO(b/217788708)" into tm-dev