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

Change-Id: Ib1c17e2fe5f36e0230845ca123b0cd2cb7365154