Hygiene: Remove TODO that is TODONE

Change-Id: Iceec1a70ff401ac40f1a2c358d7fff0eee8dbdd8
Merge "Hygiene: Remove TODO that is TODONE"