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

Change-Id: Ic6d4af3752da2672ce172f09022e0dfaf1bd0810