am 227df654: am 9ff9685f: Merge changes I7ced3653,I2b1cce8a

* commit '227df654aed4f6bfc3b2f63841c6542f3f7c91ae':
  Comments clean up for C++ API
  Fix updateFromNative in C++ API.