Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am:...
Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a2 am: c1434b45" into nyc-mr1-dev-plus-aosp
am: 626e587b
* commit '626e587b':
Change-Id: I4720100aec18ed22cb18ac21a6bc17fafafc9e72