Add comment & refactor check for Obsolete class in FindFieldFromCode am: c9af14e93f am: d70bf4824f

Change-Id: I5ed27ecd63a3a6bdbef12c3e03636326c674ae6d