Add TODO memos

Change-Id: I087b3c6ce3b9ad1fc5cab292a58af685f8b76609
4 files changed