Merge "Rename device management role holder role name" into tm-dev