Refactor inliner am: 1868de9c95

Change-Id: Iafb6f44eb6869ea0548724d9e6f7465d743ced8f