Merge "Remove TODOs that are not needed" am: 0f9842304a
am: 5c2cfc51c5

Change-Id: Ia585380cb88829bf55171092389b77081d941f17