Stop using SimpleSiteLink alias

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