Merge "Fix relative_path  update() for SystemGallery with legacy permissions" into sc-mainline-prod