Merge "Remove Android %s from search results" into main