Merge changes from topic "am-743f5b2150284eb5b5e6a47b8cc9d6b3"

* changes:
  [automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25df am: 81d8843b -s ours am: bbc3c545 -s ours am: 2becefcd -s ours
  [automerger skipped] Ignore errors preparing user storage for existing users am: e667b604 am: 8ea6cb03 -s ours am: e5404873 -s ours am: a1fd21c3 -s ours
  [automerger skipped] UserDataPreparer: reboot to recovery for system user only am: fd31f740 am: 0d80797d -s ours am: ddda3474 -s ours am: 9facb161 -s ours
  [automerger skipped] UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026 am: 4bf1a4ac -s ours am: aefe95db -s ours am: 0361bc3d -s ours