Adding support for primary and secondary links

Depends on Echo change I94aed697

Change-Id: I6654c74da12ee22beba8b479dd05ecf9fc890927