Merge "Fix AppStorageSizeTest"