Merge "Cold Sim Issue Fix" into nyc-dev
am: d0e9525b65

* commit 'd0e9525b65fc2e9d9634621b6c55ffc8a32364a6':
  Cold Sim Issue Fix

Change-Id: I47632a889672a4cd4b44d67c8b41ba4de587f73e