Merge "Do not downgrade filtered scans to opportunistic" into nyc-mr1-dev