am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new...
am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev
* commit '36db9d08':
Further work on issue #7307399: Framework needs a new pre-user-shutdown...