Merge "[BUG] fix NullPointerException in Notification.java" am: c14d5db093 am: 79e9f380e2
am: 9b0784aa5f

Change-Id: I41f9d2d027138360d3a967c97dbf3aed69512650