am 7d740cf6: am 53bc3719: Merge "Fixing a crash when doing lock profiling"

* commit '7d740cf6430a86edca1fcf20fd974b53b00136f8':
  Fixing a crash when doing lock profiling