Stop using SimpleSiteLink alias

Change-Id: I4b76cc28409069d3eb699c4e5467f2182c675310
Stop using SimpleSiteLink alias

Change-Id: Idac2243b58c454197090be4c229b876f402bcb04
Merge "Stop using SimpleSiteLink alias"
Merge "Stop using SimpleSiteLink alias"