Merge "pco and cold sim cleanup" into nyc-mr1-dev