Merge "API Review: Return status code for user management APIs"