Merge "Update diskstats to break out code & data." into oc-mr1-dev