Merge "link_type: common overrides 2nd"
am: a637a59b7e

Change-Id: I93f30dd9fb1b56ae10f3acc5279c7a2bbd52b6e2