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

* commit '10e59b1c6e4d381d5ea8f653ab191eb41d31c026':
  Exclude dying users when querying the list