cold sim cleanup

Bug: 28567303
Change-Id: Id5e593f5851460686a7fcd6a1ba352ce23cfb320
2 files changed