Merge "Emulator: handle OOM and Protocol error cases"