Merge "Rewrite link type checking" am: e4d92ef568
am: d76aaed983

Change-Id: I04cb85e8062374b9eee87806e3187b49768cf908