Merge "Fix multi-line hex dumping and add unit test."