am 0322498e: am 12631ec3: Merge "Start implementing concept of "running" users." into jb-mr1-dev

* commit '0322498e05cfec1d73bc5205d46ce86847e7dd79':
  Start implementing concept of "running" users.