am 8648dfe5: am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev

* commit '8648dfe5f52f131b0af1a17a383ce11d213cedc2':
  Convert getHourForDegrees result to 12-hour format when needed