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

* commit '58a22c56bcc101f2a1406712458749c675472a9a':
  Fixed a bug where notification header could become empty

Change-Id: Ib696dd4f85d25055c019d81e4b0d05a680acfc92