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

Change-Id: I1fbea877d10b4f270fc1722ec1c14e9bd8f131a3