am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev am: 6568a45c99

Original change: undetermined

Change-Id: I30325faa2cb52af2dd872e8f93f6d4c60a5d5ca2