Emulator fixes for Google Play Services

Fixed bugs associated with Google Play Services and the emulator.