Bytes_moved accounting fix and accounting cleanup
am: a253c2d27b

Change-Id: I6b6ae1304ddd5e2b0172a948a4ecb8d4dd657be0