Merge "Remove some obsolete TODO comments."
am: 92f22d9300

Change-Id: I60fa1ac045e4f5d0b653180ba1b10911117363e8