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

Change-Id: Ic9356edc395f68c5dda5a19a2efca31b5f16a068