Fix typos, remove callback functions - do not merge

b/15414091
Change-Id: I2f7b7ea6a7943a808de2c6a54fe810eefdee133e
8 files changed