Merge "Do not assume type relationship when recording "not assignable""