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

Change-Id: Ifccb1b9a8c1adfa7aaaa301a9019822e909dfb44