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

* commit 'da96c949acb479f9b48babe85ae506533dc9e1fd':

Change-Id: I84b720ea47a5322f181a3fa81cd550f3ac8e4271