Merge "Undeprecate storage directory APIs" into sc-v2-dev