Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37
am: 5432938bf6

* commit '5432938bf6838c934cd4e28e094b9d78eca18777':
  Fixed a crash with notification groups

Change-Id: Id90f5d886d1019871172f0f7262f818e9fb2c36a