rebase to feature branch

Author: cherylEnkidu

FirebaseFirestoreInternal.podspec

@@ -128,7 +128,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
       '"${PODS_TARGET_SRCROOT}/Firestore/Source/Public" ' +
       '"${PODS_ROOT}/nanopb" ' +
       '"${PODS_TARGET_SRCROOT}/Firestore/Protos/nanopb" ' +
-      '"$(PODS_ROOT)/gRPC-C++/third_party/re2"'
+      '"${PODS_TARGET_SRCROOT}/Firestore/third_party/re2" '
   }
 
   s.compiler_flags = '$(inherited) -Wreorder -Werror=reorder -Wno-comma'

FirebaseMessaging/Sources/FIRMessagingRmqManager.m

@@ -501,7 +501,7 @@ - (void)openDatabase {
 #ifdef SQLITE_OPEN_FILEPROTECTION_NONE
       flags |= SQLITE_OPEN_FILEPROTECTION_NONE;
 #endif
-      int result = sqlite3_open_v2([path UTF8String], &self -> _database, flags, NULL);
+      int result = sqlite3_open_v2([path UTF8String], &self->_database, flags, NULL);
       if (result != SQLITE_OK) {
         NSString *errorString = FIRMessagingStringFromSQLiteResult(result);
         NSString *errorMessage = [NSString
@@ -522,7 +522,7 @@ - (void)openDatabase {
 #ifdef SQLITE_OPEN_FILEPROTECTION_NONE
       flags |= SQLITE_OPEN_FILEPROTECTION_NONE;
 #endif
-      int result = sqlite3_open_v2([path UTF8String], &self -> _database, flags, NULL);
+      int result = sqlite3_open_v2([path UTF8String], &self->_database, flags, NULL);
       if (result != SQLITE_OK) {
         NSString *errorString = FIRMessagingStringFromSQLiteResult(result);
         NSString *errorMessage =

Firestore/Example/Tests/SpecTests/json/index_spec_test.json

@@ -71,7 +71,8 @@
                   "readTime": {
                     "timestamp": {
                       "nanoseconds": 0,
-                      "seconds": 0
+                      "seconds": 0,
+                      "type": "firestore/timestamp/1.0"
                     }
                   }
                 },
@@ -115,7 +116,8 @@
                   "readTime": {
                     "timestamp": {
                       "nanoseconds": 0,
-                      "seconds": 0
+                      "seconds": 0,
+                      "type": "firestore/timestamp/1.0"
                     }
                   }
                 },
@@ -192,7 +194,8 @@
                   "readTime": {
                     "timestamp": {
                       "nanoseconds": 0,
-                      "seconds": 0
+                      "seconds": 0,
+                      "type": "firestore/timestamp/1.0"
                     }
                   }
                 },
@@ -236,7 +239,8 @@
                   "readTime": {
                     "timestamp": {
                       "nanoseconds": 0,
-                      "seconds": 0
+                      "seconds": 0,
+                      "type": "firestore/timestamp/1.0"
                     }
                   }
                 },