Merge "Fixed typos in API and minor cleanup" into nyc-dev
am: 4ab3f48

* commit '4ab3f48ded08b628b1267bf7576e478e166ca518':
  Fixed typos in API and minor cleanup

Change-Id: I77b5b74c00b1da7d1189c4e4abf89f3cd4b8a23c