am b6f2a6df: am b8b3702f: Merge "Fix monitor contention logging to support negative line numbers"

* commit 'b6f2a6dfa2ad1db56a321a05228081ff61afd0b8':
  Fix monitor contention logging to support negative line numbers