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

Change-Id: Ia2057fe4522596b4593465db1f5d6cdcbf39c063