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

* commit '47b6df128ea7bc7809dfca1958eb42258761b533':

Change-Id: I0a63e16a8c6dd1721110f6a5b5792e262f8a6fa0