Merge "Handle case where user info might not be available." into jb-mr1-dev