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

* commit 'd0e9525b65fc2e9d9634621b6c55ffc8a32364a6':
  Cold Sim Issue Fix

Change-Id: If6faaf0afe3c24cbf3b5665a5cf5c4315f540d99