Merge "Force autofill on overflow only if empty" into oc-dev
am: 64cf2bb19b

Change-Id: Idbc5b0b7414e5537bb4f734cef439c2ebf449324