Cold Sim issue fix

Bug: 25203607
Change-Id: Ibde6a483477cb7c94f75b656d5e41748b13b23b2
7 files changed