Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev