Fixed typos in API and minor cleanup

Bug:27814691

Change-Id: I84158df741862e72979cd120296b1d6fbc8258b8
3 files changed