Merge "Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff6 am: 1c03d3fc am: 9ccb3a86"