Merge "Add 0X as a valid hex prefix for parseint"