am 4aaeabde: am 63921cfe: am 16b5d29f: Merge "Guard against name == null in ShortDump"

* commit '4aaeabde6d173aea0b202ebfea5c2d8fc7f1f67e':
  Guard against name == null in ShortDump