am 35537dae: am eab52e33: Merge "Clean up the sampling profiler"

* commit '35537dae65ef51531ce5acf270ce53d169ad06d7':
  Clean up the sampling profiler