Merge "Fixed an issue where a notification could become empty" into pi-dev
am: 68b0bb40c6

Change-Id: Ic93c2ff78325ae417f2543b898828a063a6ffbc3