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

Change-Id: Ia93d96137ea15d4a617d29aa1f3b7e12b8ce8b30