am 8012102d: Merge "Fix ids and remove invoke when inlining."

* commit '8012102dea15e62fce94f6ac32e301aa0cb3f52d':
  Fix ids and remove invoke when inlining.