From 7f02d057fd3e51620a71102df1128d178a71b369 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Mon, 2 Apr 2018 09:52:58 -0700
Subject: [PATCH 1/2] Merge

---
 .../java/com/google/cloud/firestore/ConformanceTest.java    | 3 +--
 .../java/com/google/cloud/firestore/it/ITSystemTest.java    | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
index af0aee0fe0df..0518b1cc69c8 100644
--- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
+++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
@@ -85,8 +85,7 @@ public class ConformanceTest {
   private interface ConformanceTestCase extends Test, Describable {}
 
   /** Excluded tests by test description. */
-  private final Set<String> excludedTests =
-      Collections.singleton("set: MergeAll cannot be specified with empty data."); // b/73495873
+  private final Set<String> excludedTests = Collections.emptySet();
 
   /** If non-empty, only runs tests included in this set. */
   private final Set<String> includedTests = Collections.emptySet();
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
index c764a23048fc..b1ed5b26257a 100644
--- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
+++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
@@ -80,13 +80,15 @@ public class ITSystemTest {
 
   @Rule public TestName testName = new TestName();
 
-  private Firestore firestore;
+ static private Firestore firestore;
   private CollectionReference randomColl;
   private DocumentReference randomDoc;
 
   @Before
   public void before() {
-    firestore = FirestoreOptions.getDefaultInstance().getService();
+    if (firestore == null) {
+      firestore = FirestoreOptions.getDefaultInstance().getService();
+    }
     randomColl =
         firestore.collection(
             String.format("java-%s-%s", testName.getMethodName(), LocalFirestoreHelper.autoId()));

From dc4708b91bf93714f26bda1507c978380de3e169 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Mon, 2 Apr 2018 09:55:28 -0700
Subject: [PATCH 2/2] Merge

---
 .../cloud/firestore/it/ITSystemTest.java      |   6 ++----
 .../src/test/resources/test-suite.binproto    | Bin 28098 -> 28459 bytes
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
index b1ed5b26257a..c764a23048fc 100644
--- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
+++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
@@ -80,15 +80,13 @@ public class ITSystemTest {
 
   @Rule public TestName testName = new TestName();
 
- static private Firestore firestore;
+  private Firestore firestore;
   private CollectionReference randomColl;
   private DocumentReference randomDoc;
 
   @Before
   public void before() {
-    if (firestore == null) {
-      firestore = FirestoreOptions.getDefaultInstance().getService();
-    }
+    firestore = FirestoreOptions.getDefaultInstance().getService();
     randomColl =
         firestore.collection(
             String.format("java-%s-%s", testName.getMethodName(), LocalFirestoreHelper.autoId()));
diff --git a/google-cloud-firestore/src/test/resources/test-suite.binproto b/google-cloud-firestore/src/test/resources/test-suite.binproto
index a189342735ffc66ce0af16f4225256bd26770359..6ed663ef9663b19de88a34720e2e08888fad6300 100644
GIT binary patch
delta 346
zcmX?fn{o9$#tl|XljEEnH&-(qVw#*KD7`s?Rh4tH6_exUeSB+}Cfl+~vz2iv7N?d>
zPGptayi(APWAXtuHV$?!#v~yo0jAAgB|kCqr2(0&TtKmOAcJl5S6O2o(;JLj`ao?~
z3cjgD>8Xx6ISR>%c?wCX3dIGf$(d=HsVNHOnI#ztsksFul?o||C5d`UOC}4-T5vLP
zFiJ61*D9q<PBhhIwvu9){L#R2vxb%n)8;2S_Z+Ob8W_1u3QJRqDy<aCGg6CE6_Rrj
zON&z>=H=z*>Dt;VB<JTABo<{B=jTC${YrCkoIEBQMw|Ky2=Q?-b1^0gG1^J7<N?JM
h7(qrFlWb(7pOYuZ#K{k$IJp^Zq*#^w68)4E7y%*XYAgT%

delta 144
zcmZ2|kMYoL#tl|XlWX}LH&-(qVw#*KD7`s?Rh4t{JblN_`}o!{O}1r~W-jAWoZPQ1
zwRw@CD+gba5R(9t5IYxRB9Otj`K#n7=E)zVSh(1@fMRJtG1kprWsP|@Gi$priI;I1
v6{nV1Dfp%qrKdXP<R~O3=H=y=Ot#gMXLOic$ZXEW#K9=VRK3|*_mKktWIrir