am e4f249bb: Merge "Exclude dying users when querying the list" into jb-mr1-dev

* commit 'e4f249bb7a9f999633d938d0c519631764bf969c':
  Exclude dying users when querying the list