Update TODO list

Change-Id: Iec69a833a6b42056f6f5f964a2047e3d75a87d55