am 075d77dd: am 4769f0b8: Merge "Even cleaner shutdown." into jb-mr1-dev

* commit '075d77dda23e2b799dde4cca0fbb1cdda4243fe2':
  Even cleaner shutdown.