Merge "Don't update quota for non-emulated volumes." into rvc-dev