Merge "Add support for gid derivation on private volumes" am: 0b7dbf0b1c
am: c2c183e02c

Change-Id: I71b1249e1d97bda5dc177881e0d01e3374bcf0a8