Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev