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

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

Change-Id: Ice0f13c56d98fab704516b8974521cfd4f7ff54f