Merge "Improve invalid root dumping."