Merge "Fix some incorrect annotations in AppSearch." into sc-dev