Merge "Don't double-count external cached app data." into oc-dev
am: b5a1f50f5e

Change-Id: Ia991cb98e842a9a9f64e669435c860611e79ff72