Clean up and update ClientController TODOs

Bug: 325515685
Bug: 324438289
Bug: 314150112
Test: m
Change-Id: Ia183154f3229b996e46adea44011e58d651a6b19
2 files changed