Merge "Fixup existing profile directories during upgrades"
am: 3367b569bf

Change-Id: Ie15663754ea25023ce63ed37e939c85301e3dda9