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

Change-Id: If528a200b03a3ddeb790c33c2aea33c29206a097