Merge "Set groups before dropping privileges." into nyc-dev am: fd1eee58f9
am: e179777765

* commit 'e1797777659c3258bf5f50f21a223a94641a2691':

Change-Id: I858b3fa51b705072c38981027ecfb65937dd5318