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