Merge "Create correct files in dropbox on encrypted boot" into lmp-dev