Merge changes from topic "unencrypted-dirs-s" into tm-dev

* changes:
  [automerged blank] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476 2p: 465d717d6d
  [automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476
  StorageManagerService: don't ignore failures to prepare user storage