Merge "cold sim clean up" into nyc-mr1-dev am: ba3428f01b
am: 2581d13f25

* commit '2581d13f25878caf6011a2498b869d1dc84115ca':
  cold sim clean up

Change-Id: Ie35dd1dbede46a1ae6f6a1c902e8d54321325500