Merge "Copy clat modified linkProperties into new one." into pi-dev am: 183ec8ee35
am: dc8059eea6

Change-Id: Id266fcd674f67e841a3a79a414ae04d80e3a2943