Merge "Do not assume type relationship when recording "not assignable"" am: 2f1f1679d2
am: f2953028d5

Change-Id: I70cbebc444ac7c6efedfe11a7e5a0e9438eee3a8