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

Change-Id: I756aa95832ac1a461da1392c1788c71fa8daa8b3