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

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

Change-Id: Ib518d8bb0314d54924eeda9c0c353be14f8ba1ea