Merge "Set groups before dropping privileges." am: f34304019d
am: 66c17d54e2

* commit '66c17d54e25239dd85079e115f1af7bf8a45edf8':
  Set groups before dropping privileges.

Change-Id: I94f4b9b4da1a3ec020c80ba3e13d47219f18928b