Add dynamic groups to API

Change-Id: I62beaffab6ae0815bab78dff09a209370f2a42f4
Merge "Add dynamic groups to API"