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

* commit '57e4a67be13eede636608f789d1b88d0889683ec':
  Fixed a bug where notification header could become empty

Change-Id: Iab1ee2e9d7e8436e52697978a331889b103a7031