Remove an outdated TODO comment

Change-Id: Ic0364f0714a277bf768751c58532979825a79379