Fix minor Android 2.3 bug and tests
Merge