Update TODO list

Change-Id: I07282867858ac89c1a987e860a75b970ef86a907