Merge "Fix link_type checking"
am: 665cda08f0

Change-Id: I95ca55160ae6a8b3a5d05a2a2cbc653dc3855981