Merge "Fix query management in GpuProfiler" into oc-dev
am: 511544f212

Change-Id: I854ef8bf9424a06b36e98315237868d4263f0ce2