Merge "Remove temporary file on user builds." into nyc-dev