am 2ca3b1b2: Fix CL split and build

* commit '2ca3b1b25e8ceb841396061a318d3a043cbfcb54':
  Fix CL split and build