Merge "Merge "Add a more flexible queryRecentDocuments" am: 627441218d am: a366edd78d am: 729067376c"