am cda4e2e6: Merge "Extra debug output for a failing lock check."

* commit 'cda4e2e6f4645a499a6b391053fdf4c85a1d3a16':
  Extra debug output for a failing lock check.