Merge "Merge "Fixed autofill filter comparison." into oc-dev am: 72f2d98c5a am: 4d47d7ad46"