am 77c4e48e: Merge "Fix CL split and build"

* commit '77c4e48e80b989cb80599a40fbbad9a16745d89f':
  Fix CL split and build