Merge "Revert "Add support for gid derivation on private volumes"" am: 9588da7095
am: 6b264e4a4c

Change-Id: Ic617080e8f98079bd3075621dc85f5dfa00ff5ba