Merge "Remove obsolete TODO" into nyc-dev
am: 568e63bc9b

* commit '568e63bc9b53537505016f41e48e908c4da863e5':
  Remove obsolete TODO

Change-Id: I11019dd003ed10184a0c0808b6d1021c5b2ecc40