Merge "Add null check to setAppGroupId."