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

Change-Id: If54a4c871affdaaf91134760c7948925c419f342