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