Merge "Add PCSCF to LinkProperties." am: 64e495b274 am: 40c9e752ac
am: e2bbcc1837

Change-Id: I16eedc51ad4932b7ec6a32d9e718c48cf203c2f0