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

* commit 'd974a99495fb30659134f8adf02342414fddb8b3':

Change-Id: I1bed903294bc484e1f1caecd4e594d581efc1ab7