Import from Android
Merge pull request #1335 from Fuzzysqurl/master

Import from Android