Merge "Add /data/staging to directories that shouldn't be encrypted."