Merge \\\\"Revert \\\\"Inline and optimize interface calls.\\\\"\\\\" am: a5f0a1ab am: b7d0a587 am: 2880353a am: 367e86db Change-Id: I70521a4a8e7c3f007e5b0fdf9766bf59cb9f7233