Merge "Move logic to get profile class descriptors to profile info"