Merge "Fixup existing profile directories during upgrades"