Merge "Update emulator protobuf to include status"