Merge "Remove unnecessary TODOs"
am: a5c96cf4bf

Change-Id: I1e03cd3fa9eef34218e4a4eb958fbb6dd0593be6