Merge "Cleanup whole preloads directory" into nyc-mr1-dev