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

* commit '63921cfe407e093a527c94f5e01b03e89669f18a':
  Guard against name == null in ShortDump