Merge "autofill service search uri is not backed up" into oc-dev
am: 919076aa2a

Change-Id: Ic3ee12972b0550b4b81302550636c4110c1ea4f1