Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev