Workaround for Android bug 10515463 on pre-4.4 devices
Merge pull request #1360 from greek1979/android-bug-10515463

Workaround for Android bug 10515463 on pre-4.4 devices