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

Change-Id: If39f47cc2caf6a119ff7e237cd8a06b069dca04e