Improved some Field Classification TODOs

Test: TreeHugger FTW!
Bug: 67867469
Bug: 70407264

Change-Id: Ic7063c83f79d4023f9a9c1d107b5ff75d06f4054
4 files changed