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

* commit '6684a2ce1abd94972d5480c2214a9509781c755b':
  Cleanups in Notification.java.