Merge "Revert^3 "Ensure that methods requiring interpreter entrypoint always have it."" am: e28567f3 am: d0cfcbf4 Change-Id: I767fdaa82dd741eb711daeae5ad8bebfeb9a5c54