Merge "Cleanups in Notification.java." into jb-mr1.1-dev