Merge "Revert "Revert "Inline and optimize interface calls."""