Merge changes I592d3538,I791fd630

* changes:
  Add @Nullable on SubscriptionInfo#getGroupUuid
  Adding nullability annotation.