Merge "link_type: common overrides 2nd" am: a637a59b7e am: 901e5ac899 am: 3c3124d7a9
am: 13b1ff1db0

Change-Id: I5ec6e7828d64619cb180701c0dfdc5731959a585