Merge \"Fix missing header text in notification groups\" into nyc-dev
am: a275ec269f

Change-Id: Ida3c3f33c63aa904d34c864899ddc8aac0368394