Merge "Track movement of tz files into the runtime module"