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