Merge "Create primary profile file together with app data folders" into...
Merge "Create primary profile file together with app data folders" into nyc-dev am: d25aab3c am: 8b31d72e
am: 360879e6
* commit '360879e6':
Create primary profile file together with app data folders
Change-Id: If44755f2a060f0b36666bf5597a92b9baba8230a