Merge "Test AutofillSelection" into oc-dev