Improve strings.

Also removed weird toast position code.

Change-Id: I917a35f228e1ca765802f73a2d654a3bf9311578
Merge branch 'cm' into HEAD