Merge "Fixing crash in SysUI due to invalid group." into nyc-dev
am: 814358a24f

* commit '814358a24f7bf045cdd8261f15aefff59936287b':
  Fixing crash in SysUI due to invalid group.

Change-Id: Ib194b1041b5931483857ee57c0573277e942ec31