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

* commit 'd1a6a2495ff82893728571136f4f080164c8dae5':
  Do not clean profiles unconditonally during app data clean up