[automerger skipped] Merge "DO NOT MERGE: ScanFilter: Fix argument sanitization logic." into qt-dev am: d1d4245c63 am: fc6a0c4519
am: 34d99bc4bc -s ours
am skip reason: subject contains skip directive
Change-Id: I078d96df2782dea884e5c88925291c4c5b6d65b1
This commit is contained in: