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

Change-Id: Ib77f6de6fab4ff362350473c29906041a9f55f3e