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

* commit '816f3058bdd7b888965022888e4a789ea967f444':
  Handle updates to C++ API.