Merge "Use 0x for hexadecimal prefix"