am 9ff9685f: Merge changes I7ced3653,I2b1cce8a

* commit '9ff9685f3f1013dcc416f762408f817f00ea116e':
  Comments clean up for C++ API
  Fix updateFromNative in C++ API.