DO NOT MERGE: ScanFilter: Fix argument sanitization logic.
am: 2b3b1429db

Change-Id: Iff4de4eac04076aab7c4754f533032c9e2d5253b