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