Merge "Create primary profile file together with app data folders" into nyc-dev
am: d25aab3ce8

* commit 'd25aab3ce8aab1b95ac60922981c87c6963a0a6b':
  Create primary profile file together with app data folders

Change-Id: I6f1febd72495ce95d657a79d0cf3454be50ccef5