Remove TODO done in 804c8c58.

Change-Id: Icc2f5cfd8aeb22da39ca807f38bd22db7a9f72ee