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

Change-Id: I8199add625c07edefc06464892bb6b4ee5734aca