Merge "Fix test after inlining optimization."