Merge "Rename data/staging to data/pkg_staging." am: e8510cec19
am: 9f6ba484d0

Change-Id: Id02c6009a4fa21942601708818b7509ff7cff5e3