Merge "pco and cold sim cleanup" into nyc-mr1-dev
am: 04b3422fee

* commit '04b3422fee549e781c5085322eb3d16605607395':
  pco and cold sim cleanup

Change-Id: I3bc610dfaf0e6c9ed6d973d40a280f0efb7816f8