Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev