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

Change-Id: Ibbb10778c6e12c64275c179c8d984306fcb27b4f