Merge "Extract volume_name from path for NULL volume_name in legacy database" into mainline-prod