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

Change-Id: I543c21f831b22ab5a74da370a8b18acfb5891d7e