Merge "Fix crash from non-default sims in QS" into oc-dev
am: d0ba2cd40b

Change-Id: I3e41e98b03ba9ef2d637678ee35d1ba62ca706a4