Finalizing V2 Bugs - Removing TODOs

After speaking with team, understood the context behind this TODO and
realized earlier changes made had fixed it. Removing them to then close
out the bug.

Bug: 269290341
Test: Builds, TODO change
Change-Id: I089e66b5617b09188d8b58f26c0c1a3a5a6e1edf