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

Change-Id: I85c9802acfe74e4bd333dc789d3fc8a65f303170