Merge "Suppress some search results" into oc-mr1-dev