Merge "Rewrite link type checking"
am: e4d92ef568

Change-Id: Iba88d5113ef0ce9321fb98057261323ec160d6a9