am a0ced754: Merge "Remove creation of root directory folders"

* commit 'a0ced754367e75051d64c62ee4e2f1e4b9208169':
  Remove creation of root directory folders