Merge "Copy clat modified linkProperties into new one." am: 33b5abb6f8 am: 0242723e09
am: 8e92e6ccdc

Change-Id: I50c415f254289be779ef1cbcaa4dde209fcdef4a