Merge "Copy clat modified linkProperties into new one."
am: 33b5abb6f8

Change-Id: Ia1f9ab3d5c3b889beddb4dda56ad3389c4967275