am cf8e6778: Merge "Handle updates to C++ API." into klp-dev

* commit 'cf8e6778c28319b6c5357a43831ebf1a41b56e96':
  Handle updates to C++ API.