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

* commit 'a8b722c673644b8c9cc896b0ee8a1b7b4d140b0f':
  Cold Sim Issue Fix

Change-Id: Ie1ca678fb7268c663052fa8ef62acd8e8fc01300