Merge \\"Return empty set instead of null when user is not set.\\" into nyc-mr1-dev am: 4c724f16af
am: 84e763670d

Change-Id: I2273245aed9bc55f1fb13cd8bad7b2dbd9f5a7f0