Merge "Removed UserInfo.FLAG_MASK_USER_TYPE, it's not used anywhere anymore"