Merge "Support ignoring validation failures after roam."