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

Change-Id: I054cbb995db521669f474a6e484f71933f4d6e91