am 680d6628: Merge "Add some debugging info for bug 14469172."

* commit '680d662800eb98c219d80cfc4b9285f2ac2ecfad':
  Add some debugging info for bug 14469172.