am 53d1022e: am a15d6402: Merge "Fix crash caused by toHex returning exception"

* commit '53d1022e835f0556095dee168f5bb491a29fd0ac':
  Fix crash caused by toHex returning exception