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

* commit '9daf094ca04c0f2020d460a8f03f0ca69045b85d':
  Cold Sim Issue Fix

Change-Id: I412c8cc99fc322f5352ec47651a01cc85ff0433c