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

Change-Id: I6be72bb22da1aeed8dfe5eb4bbb05d8cfd9b4257