Merge "Split usage_in_bytes into following separate fields:"