am 8cb9d3d6: am 3135e96c: am 63745578: Merge "Fix sampling profiler race condition"

* commit '8cb9d3d64894808f845a025cea0b16e131bff326':
  Fix sampling profiler race condition