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

Change-Id: Icf293e9f683a5a24c2c510c2201705c8c898fa88