Added some TODOs.

Change-Id: I8e92efcb576a3eb372e01daeff3df919a6d9a3d9