Merge "Clear shadow registers only after potentially switching interpreters." am: 38368458 am: 442bd728 am: be359e90 Change-Id: Id0f3ec17bfc8046917569eca8f087c2b51362304