Merge "Do not clean profiles unconditonally during app data clean up" into nyc-dev