TODO updates.

Change-Id: I166c644c6447de088b943c4f007ee0fa6cd899af