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

Change-Id: Icb380ba195ec25c7eacf2dc4c89639bc2a325fb8