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

Change-Id: Ibcce8fecdc791fda5b7ba109c6757e0aa08676ca