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

Change-Id: Idf93456829decc06921cce6231d6867046de3ae6