Merge "profman: inclusive language updates"