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

Change-Id: I61b929212d27ff0ce74d53d0576799b0623505d1