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

* commit '7544ac22e474547a3cbeaff0dcaf163bbbd4fca7':
  Maintain internal consistency for TimePickerClockDelegate hour

Change-Id: I1b46f64e197303507c5b3cb3c402438e51e993c3