Merge "Add 0X as a valid hex prefix for parseint" am: 392a2c8f0f am: 11373394fd am: 92b1727472
am: 35146c467d

Change-Id: I8504fe6492f31ff0b7f72fb1e672df6aae75eb54