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

* commit '0aef73a252834a07b5c9b8ded864fa4d51146a89':
  Fixed a bug where notification header could become empty

Change-Id: Iae38fcbed34c11ed1c235f1a8d455751b1489d32