Merge changes I7ced3653,I2b1cce8a

* changes:
  Comments clean up for C++ API
  Fix updateFromNative in C++ API.