am 318d87fb: am 9eacab8a: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev

* commit '318d87fb045ee6cce9e53d9bc13691b236b555c7':