Clean up TODOs am: 8fd2a85b6d am: 58e707e9c3 am: 07ab419528

Change-Id: Ie24d9e112c9a6abf9e8260f2dc83a4b667e51f43