Bytes_moved accounting fix and accounting cleanup am: a253c2d27b
am: c15fab5b6f

Change-Id: Ic6e28e2be4075b898968fba114e9ab65cdb51ebf