Merge "Fix ParseInt/ParseUint to handle explicit "0x" hex." am: ddf5edacc2
am: 1de89478ac

* commit '1de89478ac5dcb751c1d4e3fcb4fd5ba0512fbc8':
  Fix ParseInt/ParseUint to handle explicit "0x" hex.