am 41285006: am da741b4f: Merge "Adding more logging for bug: 6499508" into jb-dev

* commit '412850067104be9654e98ac65b6f00ff9f62427f':
  Adding more logging for bug: 6499508