Merge "Make allUserIds non-null."