am 173310a2: Merge "Add more debug information."

* commit '173310a27c1b58034bf47e08e58942137583fea8':
  Add more debug information.