Update TODO list

Change-Id: I32bcc7db87b02e11878d3c93a7646ea5607b796a