am de0aafe2: Merge "Remove some to-done TODOs."

* commit 'de0aafe25a25455cbe930b46a43904125bfa6299':
  Remove some to-done TODOs.