Merge "Re-label /data/pkg_staging files as staging."