Revert "Revert "Merge pull request #19753 from mnjul/bug_962902_duplicate_blob_url_in_system_app""

This reverts commit e4ab23c961f3364af962617174b0b6c8cb832db2.