am eab52e33: Merge "Clean up the sampling profiler"

* commit 'eab52e3318dd0ab0f357a8420f0a8ccea69d61f1':
  Clean up the sampling profiler