Merge "clean up the results for 'android' in search suggestions" into jb-mr1.1-ub-dev