Revert "Fixed typos in API and minor cleanup"

This reverts commit cde2a7ea6e78aa25919cd2bd5ba36536d9915ad3.

Change-Id: I71d87949246dad51e93e137183094419bddbad16
3 files changed