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

* commit '80354c4dfeae62fc120977d4fbdb8818f505b253':
  Handle the uncommon case that a name is null

Change-Id: I2569b9c4a049698e1885d829f36fef15db22269c