Merge "Do not downgrade filtered scans to opportunistic" into nyc-mr1-dev
am: 5730ef9c85

Change-Id: Ib2d4434a41cf6f334436fe1febcab300e1c2635c