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

Change-Id: I14507742154d7b7b5181e0f62a52957e968a4127