Merge "Free only the required bytes from StorageManagerService" into sc-dev