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

Change-Id: I7a5d0fbeaba87a78c6348f7e26d4e96a32f9a129