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

Change-Id: I311a885630bd4069bc8eaa6275b8f10f9a4e16ff