Update TODO list

Change-Id: I936879ab7d110b3ce8a606ea318dc155232ed918