Merge "Update diskstats to break out code & data." into oc-mr1-dev am: ca589a064e
am: db8d267527  -s ours

Change-Id: I0cbaff432260c38995aec7f38a59019dbb9c67ed