Merge "Add visibility rule for migration." into mainline-prod