Merge "Do not clear profiles after OTAs" into nyc-dev