Merge "Merge TODO(b/217397817) to TODO(b/215443343)" into tm-dev