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

Change-Id: Icbaa50cde14a3d00e151c1175d214cbf186fa74a