Merge "Avoid counting input lines twice in BlockLevelPass::execute()"