Merge "Move lagging users over to new storage API."