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

Change-Id: Id0d347305f2f35f485c6131574346fcde0eea225