Merge "Update owners for multiuser-related files"