Merge "[automerger skipped] DO NOT MERGE: Consolidate queryChildDocumentsXxx() implementations am: e11e4ca6ee am: 996e0dc472 -s ours am: 1cc97d8336 -s ours am: 6b41e7bbb6 -s ours am: b0a6e17f7b -s ours am: 5828a3dea3 -s ours am: 76e5a686c4 -s ours am: d3f363021e -s ours am: 02cccfc0f1 -s ours" into main