Merge "Improved Field Classification edit distance algorithms." into pi-dev am: a46e4d1059
am: aa70384959

Change-Id: I530b741765fc8ad27cfba92583bf739748566096