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

* commit '11eff20096c116fad518027d484af1e55a8aa6a9':

Change-Id: I87fd3dbdd02d119eea1e28fb346e8c22de155eba