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

Change-Id: I1e45492386313e24778936e79b743d709c20a239