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

Original change: undetermined

Change-Id: I916247bd3f65e5db347e25518655f9b6288987a1