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

Change-Id: I15d4da8a775a06eb9e58e08a1316196181f58d08