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

Change-Id: I55313f24f2d932fb76d1b107c9e765b507f0403d