Improvements to ChangeOpSiteLink and its test

Change-Id: Ie2b2aea6442ad104a24a9e74fea360c0855d74e3
Merge "Improvements to ChangeOpSiteLink and its test"