cold sim cleanup am: 59545b4651
am: 2aa3388cd8

* commit '2aa3388cd899ea6d7aca3f13c5e1e72becd8d63b':
  cold sim cleanup

Change-Id: I93fd5443bbc9bf0c5611fa75b9db9a77a806040f