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

Change-Id: I2452dddb73db0b6551f87e21397932f9858fbd8f