Merge "Small inlining improvements." am: 1d01ef7f0f
am: 66b6ce3a10

* commit '66b6ce3a1052e9dc55167b3852004e7ebe7f62f6':
  Small inlining improvements.