Minor corrections to try to get stable tests in SDK 15 emulator.