Merge "Fixed a bug where notification header could become empty" into nyc-dev am: 57e4a67be1
am: 58a22c56bc

* commit '58a22c56bcc101f2a1406712458749c675472a9a':

Change-Id: I7bd9775f7973f47238a7cab838dddbf4f96b99a5