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

Change-Id: I415a74ad14709e3f3cffd8e09142dc834122a966