Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev am: 7544ac22e4
am: acddbbcb21

* commit 'acddbbcb21adc975f9cc37cedc91318168732a10':
  Maintain internal consistency for TimePickerClockDelegate hour

Change-Id: I53da6dd114fb3ab2b403bc791229e28650be13c2