Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev