Merge changes from topic "am-40c3a0dafb1849c6adf94ab30f1f6406"

* changes:
  [automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25df am: 81d8843b -s ours am: bbc3c545 -s ours am: 06d0d7e6 -s ours am: 5e4422f8 -s ours
  [automerger skipped] Ignore errors preparing user storage for existing users am: e667b604 am: 8ea6cb03 -s ours am: e5404873 -s ours am: 1b7d8da8 -s ours am: 77871ac7 -s ours
  [automerger skipped] UserDataPreparer: reboot to recovery for system user only am: fd31f740 am: 0d80797d -s ours am: ddda3474 -s ours am: 2d0e7e6d -s ours am: 4ffee68f -s ours
  [automerger skipped] UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026 am: 4bf1a4ac -s ours am: aefe95db -s ours am: dc04779c -s ours am: dab4b4e4 -s ours