Merge "Rename external storage properties." into rvc-dev