Merge "New FIELD_AUTOFILL_COMPAT_MODE field." into pi-dev am: 88cc74cd6b
am: a96a951269

Change-Id: I95154065ebb1660b06d933df367973fcab3a08ea