Merge "Rename to match internal storage format." into main