Merge "Fix bulk sync in SwitchMananger."