Merge "autofill service search uri is not backed up" into oc-dev