Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b

Change-Id: I42ca63f91246d722681fc56aaf2a5e125eaf26eb