Merge "Revert^2 "Ensure that methods requiring interpreter entrypoint always have it."" am: bac1f5f3 am: c7e157dd Change-Id: I8ac4f3a759d46ca55f206e8224dd6e3dff8d07f3