Remove TODO

Change-Id: I665d0c7a4c0eb9913f9b2474325b6100344bf0fc
Merge "Remove TODO"