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

Change-Id: I84b132473d32789af6a0639113c18af1de7c2b72