Merge "Fix a race and some comments in ClipStorage." into nyc-andromeda-dev