Merge "Merge "Cold Sim Issue Fix" into nyc-dev am: d0e9525b65 am: 678356c90f" into nyc-mr1-dev-plus-aosp
am: 10f5b76977

* commit '10f5b769772ebbd338244245920f0d495fcdb4bb':

Change-Id: Ibb99eed834c7295f1dc25d547b8951e3dc9452e4