Merge "Revert "Fixed typos in API and minor cleanup"" into nyc-dev
am: f12454d

* commit 'f12454d87b6d10f0a5a2c913b816df08f7f01956':
  Revert "Fixed typos in API and minor cleanup"