Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb