Merge "Sync AppSearch from framework."