am 6f5b2092: am a4ddb549: Merge "Fix a bug in the inliner."

* commit '6f5b2092bf0c96cbb9806205f456c29fefeedcab':
  Fix a bug in the inliner.