Merge "Fixed typos in API and minor cleanup" into nyc-dev
am: 0b60a66

* commit '0b60a667333765298c3797cd0739a7afb3c648f2':
  Fixed typos in API and minor cleanup