Merge "Native test for qtaguid module" am: 77a4431748
am: 9fee7c90d6

Change-Id: Ibfad1b51f541a28e7c01e185c4886b34a6889036