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

Change-Id: I6f4434c18bf96f8541a19cfef3b5e5ae8ea2582e