Refactoring of ChangeOpSiteLink

Change-Id: I94006953ede551aa9b301fa4f02a2afe8383b223
Merge "Refactoring of ChangeOpSiteLink"