Merge "Revert "Ensure that methods requiring interpreter entrypoint always have it."" am: 16d1870b am: b4a72eab am: ff8c4445 Change-Id: Id684d3989c21232a1fccad12e6cdaa61b8fb3b22