Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev