Merge "Small inlining improvements."
am: 1d01ef7f0f

* commit '1d01ef7f0f79b032449c35203ca9543fb8a0b22f':
  Small inlining improvements.