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

Change-Id: I1fef87940fe08d875d3d449a830bd652871e2505