Merge "Improvements in the Inliner."
am: 624dc59e7d

Change-Id: Id533aa18c304da596590ab8c8759d83d8a0865c5