cold sim cleanup
am: 59545b4651

* commit '59545b46512cf658a509e4bc0ba886cb3c3aa972':
  cold sim cleanup

Change-Id: Ie100063e5c5a282060cf06f2b29900dcbe774456