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

* commit 'bf0e106a7d755355d7ff53a2b319e2e91c154641':
  Cleanups in Notification.java.