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