Merge "Modify LinkProperties address update methods." into klp-dev