Updated todoes

Change-Id: I43707d38f31791ac770b09c277fd99bf4a74c8fc
2 files changed