Merge "Remove duplicate search result when search "autofill service"" into rvc-dev