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