Merge "DO NOT MERGE: ScanFilter: Fix argument sanitization logic." into qt-dev am: d1d4245c63
am: fc6a0c4519

Change-Id: Ib6931f6d5e5c3e47a763bade39848b080f4852f7