Merge "Rename /data/staging to /data/pkg_staging."