Merge "Change the location of profile files." into nyc-dev