Merge "Do not assume type relationship when recording "not assignable"" am: 2f1f1679 am: f2953028 am: da149594 Change-Id: I38533e2a8d6677554d005486ed5fc5a536ac5987