Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c
am: 1c03d3fcef

Change-Id: I8f94db3b3b129caca53f3cb0ed0b16b2a4951648