Merge "Cosmetic changes on Field Classification TODOs and docs." into pi-dev am: a96583edf6
am: 237773621d

Change-Id: I1a959ebe36328ceafc57dfdc821877841af89e14