Merge "Fix code accounting bugs, track external app data." into oc-dev am: 4b32f7c676
am: 90d020d979

Change-Id: I7988898a2f2404e9af76b95190bd6ad839b85d77