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

Change-Id: Id940efe570f37a873df7a1b4a4b1dd1ee4ef32b0