Merge "Split base snapshots_client into v1 and v2"