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: I21a46f388ad01f5f4aa370b7a39e78737e30fc71