Merge \"Revert \"Inline and optimize interface calls.\"\"
am: a5f0a1ab3f

Change-Id: Iaf791cd9863d0bab2a0a1f2ac74cd5992183ae4b