Merge "Don't process objects with empty name" into nyc-mr1-dev
am: 1b46ad15d9

Change-Id: Iff86ab94e248f6a4d653745b57e86a242cda9042