am 800d99f6: am 9fa49cc3: Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev

* commit '800d99f6b557b8684fbdbfc882bc9789ccd3d21f':
  Fix [-] buttons in the notification builder test.