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

* commit '2a9b1c180a030b526fac668f54a1d620f230f8cb':
  pco and cold sim cleanup

Change-Id: I2492ea1ea1815756541446c9e652cb7c444b720e