Merge "Update appsearch with new upstream changes"