Fixed a bug that could lead to an empty notification am: aa3901a5ee am: 0314b86252
am: 67388cbb69

Change-Id: Ic5df0408ad39f04714d23f9b55ed90fa8dafa2ef