[automerger skipped] Bytes_moved accounting fix and accounting cleanup
am: 23628c2133 -s ours
am skip reason: change_id Iab75d271eb5b9812a127e708cf6b567d0c4c16f1 with SHA1 a253c2d27b is in history

Change-Id: Idcbc2e2329cf61152a184462a460e367b3c62011