Merge "Rename /data/staging to /data/pkg_staging." am: c45961b146
am: 54bb992148

Change-Id: I5880a70ba17e860fd17a1b9943a537e8b576825f