am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev

* commit 'b6c171b1afa871aa092dd2ec2ed25f48275ef194':
  Do cleanup when Stopping users