Merge "Add 'qti' to vendor whitelist"