Merge "Add support for "per_volume_gigabytes" and "backup_gigabytes" quota"