Remove all use of deprecated addSimpleSiteLink

Change-Id: Ia179c66fc16b213a8806f16ebf43f5f786e5a3df
Merge "Remove all use of deprecated addSimpleSiteLink"