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

* commit 'f34304019d464de0c03fe62ca7fd9e158afb598c':
  Set groups before dropping privileges.

Change-Id: If5396c913cfed13c01bd06d6a5d781439e5f6876