Merge "Restrict ALL_VOLUMES query parameter to <= R." into mainline-prod