Updates for TODO.md

Change-Id: If45333d908220aa7a03009dc4212af3e5aaa46e7