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

Change-Id: I38533e2a8d6677554d005486ed5fc5a536ac5987