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

Change-Id: Ibd74f5f45bd8aca2882af6d420d7520c93810a6c