am 7a7360ad: Merge "Add null check to setAppGroupId."

* commit '7a7360ad528576d560aa13fbb4e81740b2c425b2':
  Add null check to setAppGroupId.