Adding ability to set up optional groups for user.

Change-Id: I0109e9b5298253fac0dac090066c313e8f7fccbb
3 files changed