am 0691d964: Merge "Add debug logging." into jb-mr2-dev

* commit '0691d964384fcbb69003404fcd59c17d5f87ee01':
  Add debug logging.