am 5ba476c3: Merge "Make sessions aware of user id"

* commit '5ba476c37f997a2dfde4f0b18d77a19e7451ed55':
  Make sessions aware of user id