Merge commit 'bb6f9146' into eclair-plus-aosp * commit 'bb6f9146': DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman