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

* commit '411539c65c2f3462812f8dbc4a29b75469dadc12':
  Dump more information to diagnose problem.