Merge \\\"Revert \\\"Revert \\\"Inline and optimize interface calls.\\\"\\\"\\\" am: f731706a am: 72065f13 am: d5889494 Change-Id: I9465486182cc6e9c077c34219e0b3eacfd68bb98