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

Change-Id: I491e99f7225233d5841b61ce383325e7a1c43fa0