Merge "Add some debugging info for bug 14469172."