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

Change-Id: I38fefc9e25bc22db815ff8437bee86f2047867ae