Merge \"Fix interpreter tests.\"
am: 3e6bc4c76a

Change-Id: I639ae01f1f1c64ac5dba4e9d5fd141ff573ff592