am cd7ab371: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cd7ab371fc070206a030d298d896061458704abd':
  Unmount external storage on multi-user devices.