Merge "Dump more information to diagnose problem." am: 411539c65c
am: 1e54407316

* commit '1e54407316f15b54337a8a6d2fe29f36da76d94d':
  Dump more information to diagnose problem.