am 9fca9ecb: Merge "notification ranking infrastructure"

* commit '9fca9ecbf966372d42210f229005de43bf2d3159':
  notification ranking infrastructure