Merge "Allow addSubscriptionsIntoGroup with grouUuid that isn't assigned." am: c937749b18 am: 4643b919cd

Change-Id: I098ea6ecf3af00503b6f82f35b1044762222b1f7