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

Change-Id: I10b0c5dce363b16cf89e019d4c1120588fd1a166