[automerger skipped] DO NOT MERGE: ScanFilter: Fix argument sanitization logic. am: 2b3b1429db am: 0c674524a2
am: 6ce4cb0f1a -s ours
am skip reason: subject contains skip directive

Change-Id: I3c2fa1f247f34ff8b27bee9836020be9236a3e35