am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings."

* commit 'c97d1fbbe00a91b1a67b7c526d9cf11ffec741fa':
  Throw IllegalArgumentException on invalid hex-strings.