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: Id186b701d0cc755be0093c704ccd2aa8e0899611