Merge "Add User* OWNERS file (part 2)"