am 4dc0cf7b: am 6cf0c336: Merge "Various notification template cleanups." into jb-dev

* commit '4dc0cf7bf376aa78d7fbccc8481673d98dae7c08':
  Various notification template cleanups.