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

* commit 'f7af26551ea3c92b89738a167dc29fed80e60440':
  Add docs to C++ API.