Merge "Handle the uncommon case that a name is null" into nyc-dev am: 80354c4dfe am: f6070c15f3
am: 4e074fe333

* commit '4e074fe3335db6180748b56a8bcf9762a90bb55a':
  Handle the uncommon case that a name is null

Change-Id: I7e85eedbdbcbfc7eb90e724ef8cd6d1dee7da5a9