User/Group resources added.

Change-Id: I7296b67a015cadec42f2b3b11457a6d27d522c62
Closes-Bug: 1263161
Merge "User/Group resources added."