Merge "Move encrypted directories into place already-encrypted"