Merge "Don't check qtaguid file unless using them"
am: c8482b39f1

Change-Id: I53e5746c31bbfe3d660d730fbabcd1d241132221