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

Change-Id: Ie3abbe2dee226330576e42b44910652ff272eb74