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