addressing more nits.

firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataConverter.java

@@ -76,7 +76,7 @@ public UserDataConverter(DatabaseId databaseId) {
   /**
    * Parse document data from a non-merge set() call.
    *
-   * @param input A POJO object representing document data.
+   * @param input A map or POJO object representing document data.
    */
   public ParsedSetData parseSetData(Object input) {
     ParseAccumulator accumulator = new ParseAccumulator(UserData.Source.Set);
@@ -87,7 +87,7 @@ public ParsedSetData parseSetData(Object input) {
   /**
    * Parse document data from a set() call with SetOptions.merge() set.
    *
-   * @param input A POJO object representing document data.
+   * @param input A map or POJO object representing document data.
    * @param fieldMask A {@link FieldMask} object representing the fields to be merged.
    */
   public ParsedSetData parseMergeData(Object input, @Nullable FieldMask fieldMask) {

firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java

@@ -96,7 +96,7 @@ public static Map<String, Object> convertToPlainJavaTypes(Map<?, Object> update)
    */
   public static <T> T convertToCustomClass(
       Object object, Class<T> clazz, DocumentReference docRef) {
-    // TODO: Use DeserializeContext to encapsulate ErrorPath and docRef.
+    // TODO(wuandy): Use DeserializeContext to encapsulate ErrorPath and docRef.
     return deserializeToClass(object, clazz, ErrorPath.EMPTY);
   }
 
@@ -757,7 +757,7 @@ private Type resolveType(Type type, Map<TypeVariable<Class<T>>, Type> types) {
     }
 
     Map<String, Object> serialize(T object, ErrorPath path) {
-      // TODO: Add logic to skip @DocumentId annotated fields in serialization.
+      // TODO(wuandy): Add logic to skip @DocumentId annotated fields in serialization.
       if (!clazz.isAssignableFrom(object.getClass())) {
         throw new IllegalArgumentException(
             "Can't serialize object of class "
@@ -1015,18 +1015,4 @@ public String toString() {
       }
     }
   }
-
-  static class DeserializeContext {
-    final ErrorPath errorPath;
-    final String documentId;
-
-    DeserializeContext(ErrorPath path, String docId) {
-      errorPath = path;
-      documentId = docId;
-    }
-
-    DeserializeContext newInstanceWithErrorPath(ErrorPath newPath) {
-      return new DeserializeContext(newPath, documentId);
-    }
-  }
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/util/DocumentId.java

@@ -35,4 +35,4 @@
 @PublicApi
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD})
-public @interface DocumentId {}
+@interface DocumentId {}