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

* commit '678356c90f07819b05ba7bb3ede54eed966525d2':
  Cold Sim Issue Fix

Change-Id: I642f9e879319ac788c5b47c5d3ee2061fcca1835