Merge "Rewrite link type checking" am: e4d92ef568 am: d76aaed983 am: e834d5f059
am: 4e9e5d526c

Change-Id: I6d59e88113af92b7179e1b8dc012446147d2ce31