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

* commit '6facef70b5d6588450c6ee59a676a0cf3bfc745e':
  Do cleanup when Stopping users