Merge "Change the location of profile files." into nyc-dev
am: 30eb5b30e7

* commit '30eb5b30e7bf88fbd3397cb56cda854293ae9c4d':
  Change the location of profile files.