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