Remove TODO(TS) resolved in Change 333839
Remove TODO(TS) resolved in Change 333839

Release-Notes: skip
Change-Id: I406cc166a8fba9037edbf0d081bc5544b70b36a3

GerritCodeReview/gerrit,GerritCodeReview/gerrit,GerritCodeReview/gerrit,GerritCodeReview/gerrit,GerritCodeReview/gerrit,GerritCodeReview/gerrit,GerritCodeReview/gerrit,GerritCodeReview/gerrit