Merge "DO NOT MERGE: Check that file exists in disk in queryChildDocs" into nyc-mr1-dev