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

Change-Id: I62e651889eb2c7a499582857e497282491de4a00