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

Change-Id: Ib2dc310b57756218d0851d7aff6a0ea183714f5d