Merge "Minor improvements useful for debugging." into nyc-dev
am: e1b1ce7

* commit 'e1b1ce77da273da6fc89d04a9c8ec09d0d8adca1':
  Minor improvements useful for debugging.

Change-Id: I506966846df799a614bb6fc37a60096cc91fe251