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

* commit '0152c3391d8145aa8db2a94f1b3d14968c007754':

Change-Id: Idc7bffaab242513854980199562235a96c5d353a