Merge "Make dumpHexString() tolerate null arrays." am: a917c1db32
am: 7bb253d078

Change-Id: Id58b8039510baa518d8d10b03237681a7b842d0f