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

Change-Id: Ie46a57ce88e25e40193b073c0add69adccc14a79