Merge "Clear shadow registers only after potentially switching interpreters."
am: 3836845858

Change-Id: I8363338ea5b17de869dbd4a71c20eb2b84a42de7