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

* commit 'ef9c12988702a4915e7206b936bb7317fa3259b6':
  Change the location of profile files.