am 42e454ed: am c67fe222: am f7af2655: Merge "Add docs to C++ API." into klp-dev

* commit '42e454ed681a19b09f0643192aa596b55e420ba4':